Project file fixes from p4