More fader fixes