Fixing bugs while booting on a new environment

Change-Id: Ifc6f36e0dccd6af82423898ce51bf35a2c9b107d