Various setup updates