Fixed up a few validation bugs