Fix boot order issue.

There were some issues with the boot and load order.