Fixed more initialization issues.