Feature/localisation fixes