More release structure changes / fixes