Clean up migrations so they run forward and back

I made a couple of mistakes in migrations that made it impossible to go 
backwards.