Some fixes for mobile device rendering