Resolve some niggles around Unite configuration