Updates to better support bootstrapping a new rpi system