Final mobile fixes