Assorted cleanup / polish