Tweak CF-1.6 compliance