Bootstrap project new fixes