Project build, minor fixes