Some RFC updates