Updates to setup stuff