More settings fixes.