Tweaks to rules