Fix issues with initialization