Fixing more zombie errors