More minor fixes to validator