Fixes for Mobile