Changes based on things we learned from rebuilding and importing.