COOPR-494 last commit missed some changes, adding them in.