Migration fix& update.