Assorted minor cleanup