Fix sandbox type blacklisting, clean up code, re-enable zombies.