Fixed up initialisation.