Made more objects aware of FadeOutHandler