Bug fixes for mobile