Version bump and tag fixes