Initial fixes for rules