Fix issues with initialization.