More assorted changes