Fix rebootstrap better