Mobile fixes...
Merge pull request #1046 from affektive/mobile_fixes

Mobile fixes...