Fixed a few validation issues