Fixed a few validation errors