Project fixes after merge