More fixes for building netxng for CMake