Fix some more uninitialised data problems.