The God Unit: Mini-patch

Minor bug fixes