Fixing up some minor things...