Keep assets around for when we need it
Account for the changes in the database schema
Correct some more stop_number interactions