Assorted small changes
More assorted small changes