Minor Migration Fixes