Bugfixes for dojo generators