director generation fixes