Snag List, Round 1

#### Note 

Fixes include a migration