Small fixes for mobile