Fix references to settings not yet in master