Fixing mobile related issues.