Minor changes to validator