Mobile optimizations: Issues #7, #8, #11