[PATCH 0/3] Improve disk validation