Fixed a few small init issues.