More minor fixes for mobile