bug fixes for mobile