Update to work with qemu-bootstrap