Some initialization changes