Minor changes whilst build CMS piece