Fix setup config
More stuff need to be added and ported from our recovery tree