Rules changes to unbreak things