Fixed eg. migration code