Miscellaneous refinements.