Fix a few tiny minor things