SOme settings fixed