Multiple miscellaneous changes