Fixed things I broke