Small dir-generator enhancements