yet more migration fixes

I dumped my local db entirely in order to test migrations and found yet another set of migration typos and errors that I missed before.