diff --git a/PythonConvert.cpp b/PythonConvert.cpp
index 54fd24a..b3894ba 100644
--- a/PythonConvert.cpp
+++ b/PythonConvert.cpp
@@ -1,13 +1,31 @@
 // Copyright (c) 2013-2016 Josh Blum
+//                    2019 Nicholas Corgan
 // SPDX-License-Identifier: BSL-1.0
 
 #include <Pothos/Plugin.hpp>
 #include <cassert>
 #include <complex>
 #include <iostream>
+#include <type_traits>
+#include <Poco/Format.h>
 #include <Poco/Types.h>
 #include "PythonProxy.hpp"
 
+/***********************************************************************
+ * SFINAE typedefs
+ **********************************************************************/
+template <typename T, typename U>
+using EnableIfUnsigned = typename std::enable_if<std::is_unsigned<T>::value && (sizeof(T) < 8), U>::type;
+
+template <typename T, typename U>
+using EnableIfSigned = typename std::enable_if<std::is_signed<T>::value && (sizeof(T) < 8), U>::type;
+
+template <typename T, typename U>
+using EnableIfUnsigned64 = typename std::enable_if<std::is_unsigned<T>::value && (sizeof(T) == 8), U>::type;
+
+template <typename T, typename U>
+using EnableIfSigned64 = typename std::enable_if<std::is_signed<T>::value && (sizeof(T) == 8), U>::type;
+
 /***********************************************************************
  * Object -- Allow the use of native python objects.
  *
@@ -70,10 +88,10 @@ pothos_static_block(pothosRegisterPythonBoolConversions)
 }
 
 /***********************************************************************
- * integer types
+ * integer/long types
  **********************************************************************/
 template <typename T>
-static Pothos::Proxy convertIntNumToPyInt(Pothos::ProxyEnvironment::Sptr env, const T &num)
+static EnableIfSigned<T, Pothos::Proxy> convertIntNumToPyNum(Pothos::ProxyEnvironment::Sptr env, const T &num)
 {
     #if PY_MAJOR_VERSION >= 3
     return std::dynamic_pointer_cast<PythonProxyEnvironment>(env)->makeHandle(PyLong_FromLong(long(num)), REF_NEW);
@@ -82,6 +100,28 @@ static Pothos::Proxy convertIntNumToPyInt(Pothos::ProxyEnvironment::Sptr env, co
     #endif
 }
 
+template <typename T>
+static EnableIfUnsigned<T, Pothos::Proxy> convertIntNumToPyNum(Pothos::ProxyEnvironment::Sptr env, const T &num)
+{
+    #if PY_MAJOR_VERSION >= 3
+    return std::dynamic_pointer_cast<PythonProxyEnvironment>(env)->makeHandle(PyLong_FromUnsignedLong((unsigned long)(num)), REF_NEW);
+    #else
+    return std::dynamic_pointer_cast<PythonProxyEnvironment>(env)->makeHandle(PyInt_FromUnsignedLong((unsigned long)(num)), REF_NEW);
+    #endif
+}
+
+template <typename T>
+static EnableIfSigned64<T, Pothos::Proxy> convertIntNumToPyNum(Pothos::ProxyEnvironment::Sptr env, const T &num)
+{
+    return std::dynamic_pointer_cast<PythonProxyEnvironment>(env)->makeHandle(PyLong_FromLongLong((long long)num), REF_NEW);
+}
+
+template <typename T>
+static EnableIfUnsigned64<T, Pothos::Proxy> convertIntNumToPyNum(Pothos::ProxyEnvironment::Sptr env, const T &num)
+{
+    return std::dynamic_pointer_cast<PythonProxyEnvironment>(env)->makeHandle(PyLong_FromUnsignedLongLong((unsigned long long)num), REF_NEW);
+}
+
 static long long convertPyIntToLongLong(const Pothos::Proxy &proxy)
 {
     //python3 has only PyLong functions and we always convert to long long
@@ -101,57 +141,37 @@ static long long convertPyIntToLongLong(const Pothos::Proxy &proxy)
 
 pothos_static_block(pothosRegisterPythonIntConversions)
 {
-    Pothos::PluginRegistry::addCall("/proxy/converters/python/char_to_pyint",
-        &convertIntNumToPyInt<char>);
-    Pothos::PluginRegistry::addCall("/proxy/converters/python/schar_to_pyint",
-        &convertIntNumToPyInt<signed char>);
-    Pothos::PluginRegistry::addCall("/proxy/converters/python/uchar_to_pyint",
-        &convertIntNumToPyInt<unsigned char>);
-
-    Pothos::PluginRegistry::addCall("/proxy/converters/python/sshort_to_pyint",
-        &convertIntNumToPyInt<signed short>);
-    Pothos::PluginRegistry::addCall("/proxy/converters/python/ushort_to_pyint",
-        &convertIntNumToPyInt<unsigned short>);
-
-    Pothos::PluginRegistry::addCall("/proxy/converters/python/sint_to_pyint",
-        &convertIntNumToPyInt<signed int>);
-    Pothos::PluginRegistry::addCall("/proxy/converters/python/uint_to_pyint",
-        &convertIntNumToPyInt<unsigned int>);
-
-    Pothos::PluginRegistry::addCall("/proxy/converters/python/slong_to_pyint",
-        &convertIntNumToPyInt<signed long>);
-    Pothos::PluginRegistry::addCall("/proxy/converters/python/ulong_to_pyint",
-        &convertIntNumToPyInt<unsigned long>);
+    Pothos::PluginRegistry::addCall("/proxy/converters/python/char_to_pynum",
+        &convertIntNumToPyNum<char>);
+    Pothos::PluginRegistry::addCall("/proxy/converters/python/schar_to_pynum",
+        &convertIntNumToPyNum<signed char>);
+    Pothos::PluginRegistry::addCall("/proxy/converters/python/uchar_to_pynum",
+        &convertIntNumToPyNum<unsigned char>);
+
+    Pothos::PluginRegistry::addCall("/proxy/converters/python/sshort_to_pynum",
+        &convertIntNumToPyNum<signed short>);
+    Pothos::PluginRegistry::addCall("/proxy/converters/python/ushort_to_pynum",
+        &convertIntNumToPyNum<unsigned short>);
+
+    Pothos::PluginRegistry::addCall("/proxy/converters/python/sint_to_pynum",
+        &convertIntNumToPyNum<signed int>);
+    Pothos::PluginRegistry::addCall("/proxy/converters/python/uint_to_pynum",
+        &convertIntNumToPyNum<unsigned int>);
+
+    Pothos::PluginRegistry::addCall("/proxy/converters/python/slong_to_pynum",
+        &convertIntNumToPyNum<signed long>);
+    Pothos::PluginRegistry::addCall("/proxy/converters/python/ulong_to_pynum",
+        &convertIntNumToPyNum<unsigned long>);
+
+    Pothos::PluginRegistry::addCall("/proxy/converters/python/sllong_to_pynum",
+        &convertIntNumToPyNum<signed long long>);
+    Pothos::PluginRegistry::addCall("/proxy/converters/python/ullong_to_pynum",
+        &convertIntNumToPyNum<unsigned long long>);
 
     Pothos::PluginRegistry::add("/proxy/converters/python/pyint_to_llong",
         Pothos::ProxyConvertPair("int", &convertPyIntToLongLong));
 }
 
-/***********************************************************************
- * long types
- **********************************************************************/
-template <typename T>
-static Pothos::Proxy convertLongLongToPyLong(Pothos::ProxyEnvironment::Sptr env, const T &num)
-{
-    return std::dynamic_pointer_cast<PythonProxyEnvironment>(env)->makeHandle(PyLong_FromLongLong((long long)(num)), REF_NEW);
-}
-
-static long long convertPyLongToLongLong(const Pothos::Proxy &proxy)
-{
-    return PyLong_AsLongLong(std::dynamic_pointer_cast<PythonProxyHandle>(proxy.getHandle())->obj);
-}
-
-pothos_static_block(pothosRegisterPythonLongConversions)
-{
-    Pothos::PluginRegistry::addCall("/proxy/converters/python/sllong_to_pylong",
-        &convertLongLongToPyLong<signed long long>);
-    Pothos::PluginRegistry::addCall("/proxy/converters/python/ullong_to_pylong",
-        &convertLongLongToPyLong<unsigned long long>);
-
-    Pothos::PluginRegistry::add("/proxy/converters/python/pylong_to_llong",
-        Pothos::ProxyConvertPair("long", &convertPyLongToLongLong));
-}
-
 /***********************************************************************
  * float types
  **********************************************************************/
diff --git a/TestPython.cpp b/TestPython.cpp
index d0095b6..da0034c 100644
--- a/TestPython.cpp
+++ b/TestPython.cpp
@@ -1,4 +1,5 @@
 // Copyright (c) 2013-2017 Josh Blum
+//                    2019 Nicholas Corgan
 // SPDX-License-Identifier: BSL-1.0
 
 #include <Pothos/Testing.hpp>
@@ -9,6 +10,7 @@
 #include <cstdlib>
 #include <sstream>
 #include <complex>
+#include <limits>
 
 POTHOS_TEST_BLOCK("/proxy/python/tests", test_basic_types)
 {
@@ -37,6 +39,36 @@ POTHOS_TEST_BLOCK("/proxy/python/tests", test_basic_types)
     POTHOS_TEST_EQUAL(env->makeProxy(strVal).convert<std::string>(), strVal);
 }
 
+template <typename T>
+static void testTypeBounds(Pothos::ProxyEnvironment::Sptr env)
+{
+    const T minVal = std::numeric_limits<T>::min();
+    POTHOS_TEST_EQUAL(env->makeProxy(minVal).template convert<T>(), minVal);
+
+    const T maxVal = std::numeric_limits<T>::max();
+    POTHOS_TEST_EQUAL(env->makeProxy(maxVal).template convert<T>(), maxVal);
+}
+
+POTHOS_TEST_BLOCK("/proxy/python/tests", test_basic_type_bounds)
+{
+    auto env = Pothos::ProxyEnvironment::make("python");
+
+    testTypeBounds<char>(env);
+    testTypeBounds<short>(env);
+    testTypeBounds<int>(env);
+    testTypeBounds<long>(env);
+    testTypeBounds<long long>(env);
+
+    testTypeBounds<unsigned char>(env);
+    testTypeBounds<unsigned short>(env);
+    testTypeBounds<unsigned int>(env);
+    testTypeBounds<unsigned long>(env);
+    testTypeBounds<unsigned long long>(env);
+
+    testTypeBounds<float>(env);
+    testTypeBounds<double>(env);
+}
+
 POTHOS_TEST_BLOCK("/proxy/python/tests", test_compare_to)
 {
     auto env = Pothos::ProxyEnvironment::make("python");
@@ -189,8 +221,16 @@ POTHOS_TEST_BLOCK("/proxy/python/tests", test_numpy_types)
     auto env = Pothos::ProxyEnvironment::make("python");
     auto numpy = env->findProxy("numpy");
 
+    POTHOS_TEST_EQUAL(numpy.call("int8", 100).convert<char>(), 100);
     POTHOS_TEST_EQUAL(numpy.call("int16", 123).convert<short>(), 123);
     POTHOS_TEST_EQUAL(numpy.call("int32", 123).convert<int>(), 123);
+    POTHOS_TEST_EQUAL(numpy.call("int64", 123456789).convert<long>(), 123456789);
+    POTHOS_TEST_EQUAL(numpy.call("int64", 123456789).convert<long long>(), 123456789);
+    POTHOS_TEST_EQUAL(numpy.call("uint8", 100).convert<unsigned char>(), 100);
+    POTHOS_TEST_EQUAL(numpy.call("uint16", 123).convert<unsigned short>(), 123);
+    POTHOS_TEST_EQUAL(numpy.call("uint32", 123).convert<unsigned int>(), 123);
+    POTHOS_TEST_EQUAL(numpy.call("uint64", 123456789).convert<unsigned long>(), 123456789);
+    POTHOS_TEST_EQUAL(numpy.call("uint64", 123456789).convert<unsigned long long>(), 123456789);
     POTHOS_TEST_EQUAL(numpy.call("float32", 42.0f).convert<float>(), 42.0f);
     POTHOS_TEST_EQUAL(numpy.call("float64", 42.0).convert<double>(), 42.0);
     POTHOS_TEST_EQUAL(numpy.call("complex64", std::complex<float>(1.0f, -2.0f)).convert<std::complex<float>>(), std::complex<float>(1.0f, -2.0f));