Fix issues that arose from