Release fix and tweak