Final tweaks for CT (hope)