Improved consistency of the settings in 'Make/options'