Eliminating a couple small validator errors