Some optimizations for mobile.
merge commit