HACK-592: fix projects, correct other overwrites from bootstrap