Fixed boot errors