Various fixes and breaks on fading and whatnot