Misc changes

A few scattered changes.