Fix stuff I broke