Updates following CMS upgrade

Signed-off-by: Stephen Elford <steve@trafficwebsites.co.uk>