few small changes to r/t compatibility