5min fixes for mobile