Several miscellaneous changes