Fixed some minor things forgotten about before commit that were preventing build.