Assorted cleanup.