Minor fixes for mobile devices