more settings fixes