Resolve pre-migration errors