General updates, project file fixes