Fixed some issues I missed from the previous commit.