More settings fixes