implement stricter scan rules
Fix build error, with note for josh