[DROOLS-488] Fixes