Miscellaneous clean-up