Fixed a couple of zero map bugs.  Still a few more remain.