Make miscellaneous changes