Final tweaks for tagged release with end caps