Make further mobile optimizations