fix mobile related issues