Small rule changes
Moving to a wi codebase