The God Unit: Minor fixes

Minor fixes