Fixes for mobile devices