diff --git a/tornado-drivers/opencl/src/main/java/uk/ac/manchester/tornado/drivers/opencl/OCLPlatform.java b/tornado-drivers/opencl/src/main/java/uk/ac/manchester/tornado/drivers/opencl/OCLPlatform.java
index f58fe33b5..7cc84ce7d 100644
--- a/tornado-drivers/opencl/src/main/java/uk/ac/manchester/tornado/drivers/opencl/OCLPlatform.java
+++ b/tornado-drivers/opencl/src/main/java/uk/ac/manchester/tornado/drivers/opencl/OCLPlatform.java
@@ -71,7 +71,7 @@ public OCLPlatform(int index, long id) {
 
         final int deviceCount;
 
-        if (isVendor(Vendor.XILINX) || isVendor(Vendor.CODEPLAY)) {
+        if (isVendor(Vendor.XILINX)) {
             deviceCount = clGetDeviceCount(id, OCLDeviceType.CL_DEVICE_TYPE_ACCELERATOR.getValue());
         } else if (isVendor(Vendor.MESA)) {
             deviceCount = clGetDeviceCount(id, OCLDeviceType.CL_DEVICE_TYPE_GPU.getValue());
@@ -80,7 +80,7 @@ public OCLPlatform(int index, long id) {
         }
 
         final long[] ids = new long[deviceCount];
-        if (isVendor(Vendor.XILINX) || isVendor(Vendor.CODEPLAY)) {
+        if (isVendor(Vendor.XILINX)) {
             clGetDeviceIDs(id, OCLDeviceType.CL_DEVICE_TYPE_ACCELERATOR.getValue(), ids);
         } else if (isVendor(Vendor.MESA)) {
             clGetDeviceIDs(id, OCLDeviceType.CL_DEVICE_TYPE_GPU.getValue(), ids);
diff --git a/tornado-drivers/opencl/src/main/java/uk/ac/manchester/tornado/drivers/opencl/enums/OCLDeviceType.java b/tornado-drivers/opencl/src/main/java/uk/ac/manchester/tornado/drivers/opencl/enums/OCLDeviceType.java
index 2046a16e4..d147903c2 100644
--- a/tornado-drivers/opencl/src/main/java/uk/ac/manchester/tornado/drivers/opencl/enums/OCLDeviceType.java
+++ b/tornado-drivers/opencl/src/main/java/uk/ac/manchester/tornado/drivers/opencl/enums/OCLDeviceType.java
@@ -32,7 +32,7 @@ public enum OCLDeviceType {
 	CL_DEVICE_TYPE_GPU(1 << 2),
 	CL_DEVICE_TYPE_ACCELERATOR(1 << 3),
 	CL_DEVICE_TYPE_CUSTOM(1 << 4),
-	CL_DEVICE_TYPE_ALL(0xFFFFFFFF);
+	CL_DEVICE_TYPE_ALL(0xFFFFFFFFL);
     // @formatter:on
 
     private final long value;