Minor tweaks for release