Fixes for mobile