diff --git a/CMakeLists.txt b/CMakeLists.txt
index c85be2710..93b351f93 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -568,13 +568,14 @@ ENDIF()
 SET(STATUS_PARALLEL "OFF")
 OPTION(ENABLE_PARALLEL "Build netCDF-4 with parallel IO" OFF)
 IF(ENABLE_PARALLEL AND ENABLE_NETCDF_4)
+        MESSAGE(STATUS "Debug: ${HDF5_LIB}")
 	SET(USE_PARALLEL ON CACHE BOOL "")
 	# Check for H5Pget_fapl_mpiposx, define USE_PARALLEL_POSIX
-	CHECK_LIBRARY_EXISTS(${HDF5_LIB} H5Pget_fapl_mpioposix "" USE_PARALLEL_POSIX)
-	
+	CHECK_LIBRARY_EXISTS(${HDF5_LIB} H5Pget_fapl_mpioposix "" USE_PARALLEL_POSIX)	
+		
 	# Else Check for H5Pget_fapl_mpio, define USE_PARALLEL_MPIO
 	IF(NOT USE_PARALLEL_POSIX)
-		CHECK_LIBRARY_EXISTS(${HDF5_LIB} H5Pget_fapl_mpio "" USE_PARALLEL_MPIO)
+	       CHECK_LIBRARY_EXISTS(${HDF5_LIB} H5Pget_fapl_mpio "" USE_PARALLEL_MPIO)
 	ENDIF()
 	
 	IF(NOT USE_PARALLEL_POSIX AND NOT USE_PARALLEL_MPIO)
diff --git a/Makefile.am b/Makefile.am
index d4639b9ed..a2692dbdf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -59,11 +59,6 @@ NCDAPTESTDIR = ncdap_test
 #endif # BUILD_UTILITIES
 endif
 
-# Build libcdmr
-if BUILD_CDMREMOTE
-LIBCDMR = libcdmr
-endif
-
 # Build pnetcdf
 if USE_PNETCDF
 LIBSRC5 = libsrc5
diff --git a/libsrc5/CMakeLists.txt b/libsrc5/CMakeLists.txt
index 924cb64ba..28b2694e9 100644
--- a/libsrc5/CMakeLists.txt
+++ b/libsrc5/CMakeLists.txt
@@ -5,6 +5,6 @@ INCLUDE_DIRECTORIES(".")
 
 SET(libsrc5_SOURCES nc5dispatch.c)
 
-add_library(netcdf5 OBJECT ${libsrc_SOURCES}) 
+add_library(netcdf5 OBJECT ${libsrc5_SOURCES}) 
 
-ADD_EXTRA_DIST(${libsrc5_SOURCES} CMakeLists.txt)
\ No newline at end of file
+ADD_EXTRA_DIST(${libsrc5_SOURCES} CMakeLists.txt)
diff --git a/nc_test/CMakeLists.txt b/nc_test/CMakeLists.txt
index 3adb8e0ff..98acbb8e7 100644
--- a/nc_test/CMakeLists.txt
+++ b/nc_test/CMakeLists.txt
@@ -22,6 +22,12 @@ IF(USE_NETCDF4)
   SET(TESTS ${TESTS} tst_atts)
 ENDIF()
 
+IF(USE_PNETCDF)
+	build_bin_test_no_prefix(tst_pnetcdf)
+	build_bin_test_no_prefix(tst_parallel2)
+	add_sh_test(nc_test run_pnetcdf_test)
+ENDIF()
+
 IF(LARGE_FILE_TESTS)
   SET(TESTS ${TESTS} quick_large_files tst_big_var6 tst_big_var2 tst_big_rvar tst_big_var tst_large large_files)
 ENDIF()
@@ -64,4 +70,4 @@ FILE(COPY ${COPY_FILES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/)
 FILE(GLOB CUR_EXTRA_DIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/*.c ${CMAKE_CURRENT_SOURCE_DIR}/*.h ${CMAKE_CURRENT_SOURCE_DIR}/*.sh)
 SET(CUR_EXTRA_DIST ${CUR_EXTRA_DIST} CMakeLists.txt Makefile.am)
 SET(CUR_EXTRA_DIST ${CUR_EXTRA_DIST} test_get.m4 test_put.m4 ref_tst_diskless2.cdl)
-ADD_EXTRA_DIST("${CUR_EXTRA_DIST}")
\ No newline at end of file
+ADD_EXTRA_DIST("${CUR_EXTRA_DIST}")
diff --git a/nc_test4/CMakeLists.txt b/nc_test4/CMakeLists.txt
index 8ee94e205..e7a29a477 100644
--- a/nc_test4/CMakeLists.txt
+++ b/nc_test4/CMakeLists.txt
@@ -68,12 +68,6 @@ IF(TEST_PARALLEL)
 	add_bin_test(nc_test4 tst_nc4perf)
 ENDIF()	
 
-IF(USE_PNETCDF)
-	build_bin_test_no_prefix(tst_pnetcdf)
-	build_bin_test_no_prefix(tst_parallel2)
-	add_sh_test(nc_test4 run_pnetcdf_test)
-ENDIF()
-
 ## Specify files to be distributed by 'make dist'
 FILE(GLOB CUR_EXTRA_DIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/*.c ${CMAKE_CURRENT_SOURCE_DIR}/*.h ${CMAKE_CURRENT_SOURCE_DIR}/*.sh)
 SET(CUR_EXTRA_DIST ${CUR_EXTRA_DIST} CMakeLists.txt Makefile.am)