Minor assorted changes