Fixed validation problems