Small fixes for mobiles