Some cmt tweaks