Fix up before release