Fixed stuff that I broke with the other commit.