Fix some initialisation