some fixes for mobiles