RF# minor fixes