fix bugs induced by project layout update