Fixes for Drools-224 and Drools-225