Fixes to get it running on the high memory machine