Additional settings fixes