Assorted cleanup