Fix a couple minor things