MovieClip fixes and cleanup