Some cctld to be linkified
tweak fixes