Last minute release fixes