Mobile specific fixes and other tweaks