Various fixes to RFC 36