Fixed a couple of init issues