[R2D] Misc improvements