* Fixing a few minor things