Some enumerator improvements etc.