Update initialization

Fix issues.