Cpp linting and minor build fixes.