Fix a few minor things found in testing