Global fix on the release

This should be integrated.