diff --git a/include/fc/thread.hpp b/include/fc/thread.hpp
index 4272b53..3d23585 100644
--- a/include/fc/thread.hpp
+++ b/include/fc/thread.hpp
@@ -1,13 +1,12 @@
 #ifndef _FC_THREAD_HPP_
 #define _FC_THREAD_HPP_
 #include <fc/task.hpp>
+#include <fc/vector_fwd.hpp>
 
 namespace fc {
   class string;
   class time_point;
   class microseconds;
-  
-  template<typename T> class vector; // forward declare
 
   class thread {
     public:
diff --git a/include/fc/value.hpp b/include/fc/value.hpp
index ca777a6..7d4d17f 100644
--- a/include/fc/value.hpp
+++ b/include/fc/value.hpp
@@ -113,7 +113,7 @@ namespace fc {
         return _obj_type == reflector<T>::instance();
       }
 
-      fwd<vector<string>,8> get_keys()const; 
+      fwd<vector<string>,24> get_keys()const; 
 
       iterator              find( const char* key );
       const_iterator        find( const char* key )const;
diff --git a/include/fc/vector.hpp b/include/fc/vector.hpp
index ef78edd..89cadaf 100644
--- a/include/fc/vector.hpp
+++ b/include/fc/vector.hpp
@@ -6,6 +6,16 @@
 #include <fc/utility.hpp>
 #include <fc/log.hpp>
 
+
+#if 0
+#include <vector>
+namespace fc {
+  template<typename T>
+  using vector = std::vector<T>;
+}
+
+#else
+
 namespace fc {
   namespace detail {
     template<typename T>
@@ -348,5 +358,6 @@ namespace fc {
   };
 
 };
+#endif 
 
 #endif // _FC_VECTOR_HPP_
diff --git a/include/fc/vector_fwd.hpp b/include/fc/vector_fwd.hpp
index 361d3c9..92760b4 100644
--- a/include/fc/vector_fwd.hpp
+++ b/include/fc/vector_fwd.hpp
@@ -1,8 +1,13 @@
 #ifndef _FC_VECTOR_FWD_HPP_
 #define _FC_VECTOR_FWD_HPP_
+#if 0
+#include <fc/vector.hpp>
+#else
 namespace fc {
   template<typename T> class vector;
   template<typename T> class reflector;
   template<typename T> class reflector< fc::vector<T> >;
 };
+#endif
+
 #endif // _FC_VECTOR_FWD_HPP_
diff --git a/src/ip.cpp b/src/ip.cpp
index 6e7c24a..6e45c42 100644
--- a/src/ip.cpp
+++ b/src/ip.cpp
@@ -50,7 +50,7 @@ namespace fc { namespace ip {
   }
 
   endpoint::operator string()const {
-    return string(_ip) + ':' + boost::lexical_cast<uint16_t>(_port);
+    return string(_ip) + ':' + fc::string(boost::lexical_cast<std::string>(_port).c_str());
   }
 
 } } 
diff --git a/src/value.cpp b/src/value.cpp
index 98e991b..d9eba3b 100644
--- a/src/value.cpp
+++ b/src/value.cpp
@@ -285,8 +285,8 @@ namespace fc {
   bool value::is_boolean()const {
     return _obj_type == &reflector<bool>::instance();
   }
-  fwd<vector<string>,8> value::get_keys()const {
-    fwd<vector<string>,8> s;
+  fwd<vector<string>,24> value::get_keys()const {
+    fwd<vector<string>,24> s;
     return s;
   }