A few changes

Mostly a few maintenance things.