Fixes following migration of RCSEHS