Fixed a few validation problems