Handle more mem alloc issues found with failmalloc
2 files changed