More fixes for decisions and localisation