Minor generator performance improvements