Miscellaneous changes related to setup