diff --git a/.appveyor.yml b/.appveyor.yml
index 3361123..3f6c51f 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -15,10 +15,13 @@ environment:
   matrix:
     - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
       TOOLSET: msvc-9.0
+      ADDRMD: 32
     - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
       TOOLSET: msvc-10.0
+      ADDRMD: 32
     - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
       TOOLSET: msvc-11.0
+      ADDRMD: 32
     - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
       TOOLSET: msvc-12.0
       ADDRMD: 32,64
@@ -44,7 +47,7 @@ install:
   - git submodule update --init libs/config
   - git submodule update --init tools/boostdep
   - xcopy /s /e /q %APPVEYOR_BUILD_FOLDER% libs\functional\
-  - python tools/boostdep/depinst/depinst.py functional
+  - python tools/boostdep/depinst/depinst.py -I forward/test -I factory/test -I overloaded_function/test functional
   - cmd /c bootstrap
   - b2 headers
 
diff --git a/.travis.yml b/.travis.yml
index f4daab3..63245f8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -285,7 +285,7 @@ install:
   - git submodule update --init tools/boostdep
   - mkdir -p libs/functional
   - cp -r $TRAVIS_BUILD_DIR/* libs/functional
-  - python tools/boostdep/depinst/depinst.py functional
+  - python tools/boostdep/depinst/depinst.py -I forward/test -I factory/test -I overloaded_function/test functional
   - ./bootstrap.sh
   - ./b2 headers
 
diff --git a/meta/libraries.json b/meta/libraries.json
index c9d7a3b..7b12a28 100644
--- a/meta/libraries.json
+++ b/meta/libraries.json
@@ -9,7 +9,8 @@
         "description": "The Boost.Function library contains a family of class templates that are function object wrappers.",
         "category": [
             "Function-objects"
-        ]
+        ],
+        "cxxstd": "03"
     },
     {
         "key": "functional/factory",
@@ -27,7 +28,8 @@
         "documentation": "factory/",
         "category": [
             "Function-objects"
-        ]
+        ],
+        "cxxstd": "03"
     },
     {
         "key": "functional/forward",
@@ -43,7 +45,8 @@
         "documentation": "forward/",
         "category": [
             "Function-objects"
-        ]
+        ],
+        "cxxstd": "03"
     },
     {
         "key": "functional/overloaded_function",
@@ -59,6 +62,7 @@
         "documentation": "overloaded_function/",
         "category": [
             "Function-objects"
-        ]
+        ],
+        "cxxstd": "03"
     }
 ]