fixes to gen isolation