MotionKit and ProMotion fixes