More localisation improvements