Tweaks for CM integration

No functional changes, no need to update if you're happily using -v1.