fixes for further guvnor refactoring