fixes after guvnor refactor