Fixing mobile implementations