Some fixes for mobile #3