CP and mobile fixes