more annoying fixes for mobile