Starting Validation fixes