Some more tweaks to release process