Fix issues in initialization.