generator fixes for initial release