Fixes to release