HOTFIX 2017.2.502.1+ Changed the way we handle memory in a few places

Changed the way we handle memory in a few places to reduce the chance of the server encountering an Out of Memory Exception