Fixes for RFC 2231