Adjustments for correct migration