Fix bugs in generator bundle