Several fixes and cleanups, mostly to fix Zombotron issues