[R2D] minor changes