CRMT2: Tweaks