More setup tweaks