Minor updates to rules engine