Miscellaneous changes here and there.