Fixed initialisation issues