Address some setup quirks