dir-generator: fixes