Assorted Minor Changes