Some initialization sequence bugfixes: