Some fixes for mobile #2