Minor changes for migration