Some first fixes for mobile optimization