More setup updates