more RFC 6901 compliance tweaks