Fix rule definitions