Fixed building failure and unbootable problem