more rfc fixes