Fixes for initial migrations