cms linker plugin tweaks.