Some fixes for mobile #4