Miscellaneous improvements.