Miscellaneous clean-ups.