Minor usability improvements

Fix up a few minor issues.