change some of the locking around migrations to smooth things out