Fixed some validation problems