NpsBOW and minor CMakeLists.txt fix