Fixes for mobile mode