Minor fixes

A bunch of minor updates that have been hanging around.