Mobile Optimizations

More mobile fixes