Fixed a few minor things that I missed earlier