Bug fixes for Mercury
fix mobile bugs for Spartan/Mercury