Validator fixes for localisation