Fixed initialisation order errors