Fixed bugs that I broke earlier (whoops)