Some settings fixes