[R2D] Minor changes