Adding in a couple performance enhancements to fix iOS