Minor tidyup and add hw-release