Fixing Mobile issues