Correct R+ bugs