bug fixes when some settings are disabled