ENH minor enhancements, RF's