Fixed some more initialization issues.