fixes for new rules engine