Updates to follow the RTS tidyup