Fixes to rules