Updating: miscellaneous changes