fixes to generators