minor fixes to initialisation order