Cleaning up some minor things