Fix rules issues