more fixes of guvnor refactor