Almost last fixes to release