Fixing all the places I broke with primary keys.