Fix settings issues and localisation