Yet more setup tweaks