Mark migrated rules
Fix minor quality flaws