fixes to line up with refex API cleanup.