Mobile issues fix