diff --git a/CMakeLists.txt b/CMakeLists.txt
index cac476d4c36f5f79cb23eccc8bfd95d9740f910e..a9f18ce1eee33ef2c21ccfa1f071f827c79dc4d9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -69,10 +69,6 @@ FIND_PATH(LIBCORPUS2_SRC_DATA_DIR
 )
 MARK_AS_ADVANCED(LIBCORPUS2_SRC_DATA_DIR)
 
-add_subdirectory(libpwrutils)
-add_subdirectory(libcorpus2)
-add_subdirectory(libcorpus2_whole)
-
 if(CORPUS2_BUILD_POLIQARP)
 	add_subdirectory(poliqarp-library)
 	add_subdirectory(poliqarp)
@@ -81,6 +77,9 @@ else()
 	message(STATUS "Not building Poliqarp library and wrapper")
 endif(CORPUS2_BUILD_POLIQARP)
 
+add_subdirectory(libpwrutils)
+add_subdirectory(libcorpus2)
+add_subdirectory(libcorpus2_whole)
 add_subdirectory(corpus2tools)
 add_subdirectory(tests)
 
diff --git a/corpus2data/nkjp.tagset b/corpus2data/nkjp.tagset
index c3a2ccc9cfae4691cb8f08b106910fe7efa4aed5..b1e0be196d37fca157d7345ec409d5fd1ebc2990 100644
--- a/corpus2data/nkjp.tagset
+++ b/corpus2data/nkjp.tagset
@@ -35,8 +35,8 @@ depr	nmb cas gnd
 ger	nmb cas gnd asp ngt
 ppron12	nmb cas gnd per [acn]
 ppron3	nmb cas gnd per [acn] [ppr]
-num	nmb cas gnd acm
-numcol	nmb cas gnd acm
+num	nmb cas gnd [acm]
+numcol	nmb cas gnd [acm]
 adj	nmb cas gnd deg
 pact	nmb cas gnd asp ngt
 ppas	nmb cas gnd asp ngt
diff --git a/corpus2data/sgjp.tagset b/corpus2data/sgjp.tagset
index 95a6d09c718970ef8225eef46b59a4e3230d7340..fec42f8d5ef6581825b98381f750d10dc8e418c3 100644
--- a/corpus2data/sgjp.tagset
+++ b/corpus2data/sgjp.tagset
@@ -35,8 +35,8 @@ depr	nmb cas gnd
 ger	nmb cas gnd asp ngt
 ppron12	nmb cas gnd per [acn]
 ppron3	nmb cas gnd per [acn] [ppr]
-num	nmb cas gnd acm
-numcol	nmb cas gnd acm
+num	nmb cas gnd [acm]
+numcol	nmb cas gnd [acm]
 adj	nmb cas gnd deg
 pact	nmb cas gnd asp ngt
 ppas	nmb cas gnd asp ngt