diff --git a/include/isaac/array.h b/include/isaac/array.h
index 4cf3dfa18..c3444a670 100644
--- a/include/isaac/array.h
+++ b/include/isaac/array.h
@@ -120,6 +120,8 @@ public:
   INSTANTIATE(unsigned int)
   INSTANTIATE(long)
   INSTANTIATE(unsigned long)
+  INSTANTIATE(long long)
+  INSTANTIATE(unsigned long long)
   INSTANTIATE(float)
   INSTANTIATE(double)
 #undef INSTANTIATE
diff --git a/include/isaac/value_scalar.h b/include/isaac/value_scalar.h
index bb0180910..5bc1496fe 100644
--- a/include/isaac/value_scalar.h
+++ b/include/isaac/value_scalar.h
@@ -38,6 +38,8 @@ public:
   ISAAC_INSTANTIATE(unsigned int)
   ISAAC_INSTANTIATE(long)
   ISAAC_INSTANTIATE(unsigned long)
+  ISAAC_INSTANTIATE(long long)
+  ISAAC_INSTANTIATE(unsigned long long)
   ISAAC_INSTANTIATE(float)
   ISAAC_INSTANTIATE(double)
 #undef ISAAC_INSTANTIATE
@@ -59,6 +61,8 @@ public:
   INSTANTIATE(unsigned int)
   INSTANTIATE(long)
   INSTANTIATE(unsigned long)
+  INSTANTIATE(long long)
+  INSTANTIATE(unsigned long long)
   INSTANTIATE(float)
   INSTANTIATE(double)
 #undef INSTANTIATE
@@ -90,6 +94,8 @@ RET OPNAME (value_scalar const &, int   );\
 RET OPNAME (value_scalar const &, unsigned int  );\
 RET OPNAME (value_scalar const &, long  );\
 RET OPNAME (value_scalar const &, unsigned long );\
+RET OPNAME (value_scalar const &, long long);\
+RET OPNAME (value_scalar const &, unsigned long long);\
 RET OPNAME (value_scalar const &, float );\
 RET OPNAME (value_scalar const &, double);\
 RET OPNAME (char   , value_scalar const &);\
@@ -100,6 +106,8 @@ RET OPNAME (int    , value_scalar const &);\
 RET OPNAME (unsigned int   , value_scalar const &);\
 RET OPNAME (long   , value_scalar const &);\
 RET OPNAME (unsigned long  , value_scalar const &);\
+RET OPNAME (long long, value_scalar const &);\
+RET OPNAME (unsigned long long, value_scalar const &);\
 RET OPNAME (float  , value_scalar const &);\
 RET OPNAME (double , value_scalar const &);\
 RET OPNAME (value_scalar const &, value_scalar const &);
diff --git a/lib/array.cpp b/lib/array.cpp
index 1aa47ea72..e4b449b47 100644
--- a/lib/array.cpp
+++ b/lib/array.cpp
@@ -38,6 +38,8 @@ INSTANTIATE(int);
 INSTANTIATE(unsigned int);
 INSTANTIATE(long);
 INSTANTIATE(unsigned long);
+INSTANTIATE(long long);
+INSTANTIATE(unsigned long long);
 INSTANTIATE(float);
 INSTANTIATE(double);
 #undef INSTANTIATE
@@ -76,6 +78,8 @@ INSTANTIATE(int);
 INSTANTIATE(unsigned int);
 INSTANTIATE(long);
 INSTANTIATE(unsigned long);
+INSTANTIATE(long long);
+INSTANTIATE(unsigned long long);
 INSTANTIATE(float);
 INSTANTIATE(double);
 #undef INSTANTIATE
@@ -170,6 +174,8 @@ INSTANTIATE(int);
 INSTANTIATE(unsigned int);
 INSTANTIATE(long);
 INSTANTIATE(unsigned long);
+INSTANTIATE(long long);
+INSTANTIATE(unsigned long long);
 INSTANTIATE(float);
 INSTANTIATE(double);
 #undef INSTANTIATE
@@ -370,6 +376,8 @@ scalar& scalar::operator=(value_scalar const & s)
   INSTANTIATE(unsigned int)
   INSTANTIATE(long)
   INSTANTIATE(unsigned long)
+  INSTANTIATE(long long)
+  INSTANTIATE(unsigned long long)
   INSTANTIATE(float)
   INSTANTIATE(double)
 #undef INSTANTIATE
@@ -842,6 +850,8 @@ INSTANTIATE(int);
 INSTANTIATE(unsigned int);
 INSTANTIATE(long);
 INSTANTIATE(unsigned long);
+INSTANTIATE(long long);
+INSTANTIATE(unsigned long long);
 INSTANTIATE(float);
 INSTANTIATE(double);
 
diff --git a/lib/value_scalar.cpp b/lib/value_scalar.cpp
index 1a4e33cec..6d3a3bb68 100644
--- a/lib/value_scalar.cpp
+++ b/lib/value_scalar.cpp
@@ -38,6 +38,8 @@ INSTANTIATE(int)
 INSTANTIATE(unsigned int)
 INSTANTIATE(long)
 INSTANTIATE(unsigned long)
+INSTANTIATE(long long)
+INSTANTIATE(unsigned long long)
 INSTANTIATE(float)
 INSTANTIATE(double)
 
@@ -82,6 +84,8 @@ T value_scalar::cast() const
   INSTANTIATE(unsigned int)
   INSTANTIATE(long)
   INSTANTIATE(unsigned long)
+  INSTANTIATE(long long)
+  INSTANTIATE(unsigned long long)
   INSTANTIATE(float)
   INSTANTIATE(double)
 #undef INSTANTIATE
@@ -94,8 +98,8 @@ value_scalar int32(int32_t v) { return value_scalar(v); }
 value_scalar uint32(u_int32_t v) { return value_scalar(v); }
 value_scalar int64(int64_t v) { return value_scalar(v); }
 value_scalar uint64(u_int64_t v) { return value_scalar(v); }
-value_scalar float32(cl_float v) { return value_scalar(v); }
-value_scalar float64(cl_double v) { return value_scalar(v); }
+value_scalar float32(float v) { return value_scalar(v); }
+value_scalar float64(double v) { return value_scalar(v); }
 
 #define VALUE(type, OP, x, y) (type)x OP y
 #define INSTANTIATE(NAME, LDEC, RDEC, OP)\
@@ -126,6 +130,8 @@ value_scalar NAME(LDEC, RDEC)\
   INSTANTIATE(NAME, value_scalar const & x, unsigned int y, EXPR)\
   INSTANTIATE(NAME, value_scalar const & x, long y, EXPR)\
   INSTANTIATE(NAME, value_scalar const & x, unsigned long y, EXPR)\
+  INSTANTIATE(NAME, value_scalar const & x, long long y, EXPR)\
+  INSTANTIATE(NAME, value_scalar const & x, unsigned long long y, EXPR)\
   INSTANTIATE(NAME, value_scalar const & x, float y, EXPR)\
   INSTANTIATE(NAME, value_scalar const & x, double y, EXPR)\
   INSTANTIATE(NAME, char y,   value_scalar const & x, EXPR)\
@@ -136,6 +142,8 @@ value_scalar NAME(LDEC, RDEC)\
   INSTANTIATE(NAME, unsigned int y,   value_scalar const & x, EXPR)\
   INSTANTIATE(NAME, long y,   value_scalar const & x, EXPR)\
   INSTANTIATE(NAME, unsigned long y,  value_scalar const & x, EXPR)\
+  INSTANTIATE(NAME, long long y,   value_scalar const & x, EXPR)\
+  INSTANTIATE(NAME, unsigned long long y,  value_scalar const & x, EXPR)\
   INSTANTIATE(NAME, float y,  value_scalar const & x, EXPR)\
   INSTANTIATE(NAME, double y, value_scalar const & x, EXPR)