Update to work with new boot/finalize process