No warnings on mac completion (use proper header)
Roll back of memory fix patch for now as it was producing invalid vector.bin files.