Minor changes to Validation