More bug fixes

See twin PR in drools