More initial setup tweaks