Fix a few minor things