more setup-related changes