Don't use the toplevel cmake paths so the build works as a subproject
Fix a couple more warnings