more fixes for mobile