Fixing enabling/disabling of features according to config.