Fix some things when new features are off