Tweaks to rulebuilder