Fixing mobile issues