Fixes for mobile bugs