Minor changes/fixes to RFC94