diff --git a/include/fc/static_variant.hpp b/include/fc/static_variant.hpp
index 88069d0..768231a 100644
--- a/include/fc/static_variant.hpp
+++ b/include/fc/static_variant.hpp
@@ -118,7 +118,7 @@ public:
     template<typename X, typename = type_in_typelist<X>>
     struct tag
     {
-       static constexpr int value = typelist::index_of<list, X>();
+       static constexpr tag_type value = typelist::index_of<list, X>();
     };
 
     struct type_lt {
@@ -302,7 +302,7 @@ public:
         });
     }
 
-    static constexpr int count() { return typelist::length<list>(); }
+    static constexpr size_t count() { return typelist::length<list>(); }
     void set_which( tag_type w ) {
       FC_ASSERT( w >= 0 );
       FC_ASSERT( w < count() );