Fixed key migration (maybe)