Minor updates for tagged release