More minor changes to validation