settings fixes