Project file fixes
(cherry picked from commit 2ac07401561bb7fb76c10a5ce4a3e364a15a0157)