Misc. cleanups, and so on.