ENH minor changes