Update for new boot/hoplon