Zombothing fixes