Make miscellaneous minor changes