Post-release minor refinements