Updates to Boot and OAuth