Fixed errors during bootstrap