Project flow fixes 2