Add some rules; fixes #5767