Fixed a couple of bugs in Generator