Updates to local-bootstrap