iPad optimizations per #59