Fixed some issues with the build. It's still not building the test subproject.