Fixes for latest gengine change