More release fixes