Boot Fixes

Change-Id: Ib00c2af1305a22e6fd542eea3a216f5b5da1b201