RF minor fixes