Resolved some / issues with the cms prefix.