adjustments after recent kie and drools refactor