fixing a few validation errors