Minor tweaks to zombie builder