diff --git a/wrappers/matlab/align.m b/wrappers/matlab/align.m
index 84db472c16..77813a8a72 100644
--- a/wrappers/matlab/align.m
+++ b/wrappers/matlab/align.m
@@ -4,7 +4,7 @@
         % Constructor
         function this = align(align_to)
             narginchk(1, 1);
-            validateattributes(align_to, {'realsense.stream', 'numeric'}, {'scalar', 'nonnegative', 'real', 'integer', '<=', realsense.stream.count});
+            validateattributes(align_to, {'realsense.stream', 'numeric'}, {'scalar', 'nonnegative', 'real', 'integer', '<=', int64(realsense.stream.count)});
             this.objectHandle = realsense.librealsense_mex('rs2::align', 'new', int64(align_to));
             this = this@realsense.filter(out);
         end
diff --git a/wrappers/matlab/colorizer.m b/wrappers/matlab/colorizer.m
index fabc0c844c..5ba56de5e1 100644
--- a/wrappers/matlab/colorizer.m
+++ b/wrappers/matlab/colorizer.m
@@ -6,7 +6,7 @@
             if (nargin == 0)
                 out = realsense.librealsense_mex('rs2::colorizer', 'new');
             else
-                validateattributes(color_scheme, {'numeric'}, {'scalar', 'nonnegative', 'real'});
+                validateattributes(color_scheme, {'numeric'}, {'scalar', 'nonnegative', 'real', 'integer'});
                 out = realsense.librealsense_mex('rs2::colorizer', 'new', double(color_scheme));
             end
             this = this@realsense.filter(out);
diff --git a/wrappers/matlab/config.m b/wrappers/matlab/config.m
index 1f874c73f0..d596eaafb9 100644
--- a/wrappers/matlab/config.m
+++ b/wrappers/matlab/config.m
@@ -115,11 +115,11 @@ function enable_record_to_file(this, file_name)
         end
         function disable_stream(this, stream, index)
             narginchk(2, 3);
-            validateattributes(stream, {'realsense.stream', 'numeric'}, {'scalar', 'nonnegative', 'real', 'integer', '<=', realsense.stream.count}, '', 'stream', 2);
+            validateattributes(stream, {'realsense.stream', 'numeric'}, {'scalar', 'nonnegative', 'real', 'integer', '<=', int64(realsense.stream.count)}, '', 'stream', 2);
             if nargin == 2
                 out = realsense.librealsense_mex('rs2::config', 'disable_stream', this.objectHandle, int64(stream));
             else
-                validateattributes(index, {'numeric'}, {'scalar', 'nonnegative', 'real', 'integer'}, '', 'index', 3);
+                validateattributes(index, {'numeric'}, {'scalar', 'real', 'integer'}, '', 'index', 3);
                 out = realsense.librealsense_mex('rs2::config', 'disable_stream', this.objectHandle, int64(stream), int64(index));
             end
             stream = realsense.stream_profile(out{:});
diff --git a/wrappers/matlab/device.m b/wrappers/matlab/device.m
index 73332b77a1..4bcd154251 100644
--- a/wrappers/matlab/device.m
+++ b/wrappers/matlab/device.m
@@ -52,13 +52,13 @@ function delete(this)
         end
         function value = supports(this, info)
             narginchk(2, 2);
-            validateattributes(info, {'realsense.camera_info', 'numeric'}, {'scalar', 'nonnegative', 'real', 'integer', '<=', realsense.camera_info.count}, '', 'info', 2);
+            validateattributes(info, {'realsense.camera_info', 'numeric'}, {'scalar', 'nonnegative', 'real', 'integer', '<=', int64(realsense.camera_info.count)}, '', 'info', 2);
             this.do_init();
             value = realsense.librealsense_mex('rs2::device', 'supports', this.objectHandle, int64(info));
         end
         function info = get_info(this, info)
             narginchk(2, 2);
-            validateattributes(info, {'realsense.camera_info', 'numeric'}, {'scalar', 'nonnegative', 'real', 'integer', '<=', realsense.camera_info.count}, '', 'info', 2);
+            validateattributes(info, {'realsense.camera_info', 'numeric'}, {'scalar', 'nonnegative', 'real', 'integer', '<=', int64(realsense.camera_info.count)}, '', 'info', 2);
             this.do_init();
             info = realsense.librealsense_mex('rs2::device', 'get_info', this.objectHandle, int64(info));
         end
diff --git a/wrappers/matlab/frame.m b/wrappers/matlab/frame.m
index d6492ed17d..27d3ac3dbd 100644
--- a/wrappers/matlab/frame.m
+++ b/wrappers/matlab/frame.m
@@ -30,12 +30,12 @@ function delete(this)
         end
         function metadata = get_frame_metadata(this, frame_metadata)
             narginchk(2, 2);
-            validateattributes(frame_metadata, {'realsense.frame_metadata_value', 'numeric'}, {'scalar', 'nonnegative', 'real', 'integer', '<=', realsense.frame_metadata_value.count}, '', 'frame_metadata', 2);
+            validateattributes(frame_metadata, {'realsense.frame_metadata_value', 'numeric'}, {'scalar', 'nonnegative', 'real', 'integer', '<=', int64(realsense.frame_metadata_value.count)}, '', 'frame_metadata', 2);
             metadata = realsense.librealsense_mex('rs2::frame', 'get_frame_metadata', this.objectHandle, int64(frame_metadata));
         end
         function value = supports_frame_metadata(this, frame_metadata)
             narginchk(2, 2);
-            validateattributes(frame_metadata, {'realsense.frame_metadata_value', 'numeric'}, {'scalar', 'nonnegative', 'real', 'integer', '<=', realsense.frame_metadata_value.count}, '', 'frame_metadata', 2);
+            validateattributes(frame_metadata, {'realsense.frame_metadata_value', 'numeric'}, {'scalar', 'nonnegative', 'real', 'integer', '<=', int64(realsense.frame_metadata_value.count)}, '', 'frame_metadata', 2);
             value = realsense.librealsense_mex('rs2::frame', 'supports_frame_metadata', this.objectHandle, int64(frame_metadata));
         end
         function frame_number = get_frame_number(this)
diff --git a/wrappers/matlab/frameset.m b/wrappers/matlab/frameset.m
index 6d938c140f..c36111a2b3 100644
--- a/wrappers/matlab/frameset.m
+++ b/wrappers/matlab/frameset.m
@@ -33,7 +33,7 @@
             if (nargin == 1)
                 ret = realsense.librealsense_mex('rs2::frameset', 'get_infrared_frame', this.objectHandle);
             else
-                validateattributes(index, {'numeric'}, {'scalar', 'nonnegative', 'real', 'integer', '<=', 2}, '', 'index', 2);
+                validateattributes(index, {'numeric'}, {'scalar', 'real', 'integer'}, '', 'index', 2);
                 ret = realsense.librealsense_mex('rs2::frameset', 'get_infrared_frame', this.objectHandle, int64_t(index));
             end
             infrared_frame = realsense.video_frame(ret);
diff --git a/wrappers/matlab/sensor.m b/wrappers/matlab/sensor.m
index baf0f9162e..16b5f0e267 100644
--- a/wrappers/matlab/sensor.m
+++ b/wrappers/matlab/sensor.m
@@ -20,12 +20,12 @@ function open(this, profiles)
         end
         function value = supports_camera_info(this, info)
             narginchk(2, 2)
-            validateattributes(info, {'realsense.camera_info', 'numeric'},{'scalar', 'nonnegative', 'real', 'integer', '<=', realsense.camera_info.count}, '', 'info', 2);
+            validateattributes(info, {'realsense.camera_info', 'numeric'},{'scalar', 'nonnegative', 'real', 'integer', '<=', int64(realsense.camera_info.count)}, '', 'info', 2);
             value = realsense.librealsense_mex('rs2::sensor', 'supports#rs2_camera_info', this.objectHandle, int64(info));
         end
         function value = get_info(this, info)
             narginchk(2, 2)
-            validateattributes(info, {'realsense.camera_info', 'numeric'},{'scalar', 'nonnegative', 'real', 'integer', '<=', realsense.camera_info.count}, '', 'info', 2);
+            validateattributes(info, {'realsense.camera_info', 'numeric'},{'scalar', 'nonnegative', 'real', 'integer', '<=', int64(realsense.camera_info.count)}, '', 'info', 2);
             value = realsense.librealsense_mex('rs2::sensor', 'get_info', this.objectHandle, int64(info));
         end
         function close(this)
diff --git a/wrappers/matlab/stream_profile.m b/wrappers/matlab/stream_profile.m
index 5b9c8e0a14..bd006cb62f 100644
--- a/wrappers/matlab/stream_profile.m
+++ b/wrappers/matlab/stream_profile.m
@@ -38,9 +38,9 @@ function delete(this)
         end
         function profile = clone(this, type, index, fmt)
             narginchk(4, 4);
-            validateattributes(type, {'realsense.stream', 'numeric'}, {'scalar', 'nonnegative', 'real', 'integer', '<=', realsense.stream.count}, '', 'type', 2);
+            validateattributes(type, {'realsense.stream', 'numeric'}, {'scalar', 'nonnegative', 'real', 'integer', '<=', int64(realsense.stream.count)}, '', 'type', 2);
             validateattributes(index, {'numeric'}, {'scalar', 'nonnegative', 'real', 'integer'}, '', 'index', 3);
-            validateattributes(fmt, {'realsense.format', 'numeric'}, {'scalar', 'nonnegative', 'real', 'integer', '<=', realsense.format.count}, '', 'fmt', 4);
+            validateattributes(fmt, {'realsense.format', 'numeric'}, {'scalar', 'nonnegative', 'real', 'integer', '<=', int64(realsense.format.count)}, '', 'fmt', 4);
             out = realsense.librealsense_mex('rs2::stream_profile', 'clone', this.objectHandle, int64(type), int64(index), int64(fmt));
             profile = realsense.stream_profile(out{:});
         end