Various RFC fixes