Fix initialisation problems.