- Flush the new control set after the control set has been created. - Make sure that we create a new control set only on the first boot after setup. - Move the control set copy code to a separate function. - Get rid of the global control set values.