Fixes for bulk migration