Further improved mobile compatibility