Assorted changes

Random changes. Nothing big.