more fixes from hidden migration bugs