Small bugfixes in gen