Fixed init ordering issues.