various fixes for mobile