Move a few rules to a more appropriate place