Merge "Refresh some of our error prone rules"