Fixed some errors I made when merging. Oops.