Fix issues that arose in latest migration