Fix broken project merge
Fix build warnings