Assorted clean-up