Harden the initialisation process (#1).