Fixed some things I broke