Fixing up a few minor things