Final changes before migration