some bug fixes for mobile