Various miscellaneous changes