[RDY] Rbuffer fixes

Fix some bugs introduced in #1300(thanks @oni-link for spotting one of the problems)