Improvements to RFC2 (#245)