diff --git a/hdfview/pom.xml b/hdfview/pom.xml
index 26867515..acc737e5 100644
--- a/hdfview/pom.xml
+++ b/hdfview/pom.xml
@@ -90,7 +90,7 @@
     <dependency>
       <groupId>org.eclipse.nebula.widgets.nattable</groupId>
       <artifactId>org.eclipse.nebula.widgets.nattable.core</artifactId>
-      <version>2.5.0</version>
+      <version>2.6.0</version>
       <scope>compile</scope>
       <exclusions>
         <exclusion>
diff --git a/hdfview/src/main/java/hdf/view/TableView/DefaultBaseTableView.java b/hdfview/src/main/java/hdf/view/TableView/DefaultBaseTableView.java
index 9e3389be..71e52eb8 100644
--- a/hdfview/src/main/java/hdf/view/TableView/DefaultBaseTableView.java
+++ b/hdfview/src/main/java/hdf/view/TableView/DefaultBaseTableView.java
@@ -1140,6 +1140,28 @@ protected void loadData(DataFormat theDataObject) throws Exception
         if (theDataObject.getRank() > 2)
             theDataObject.getSelectedDims()[theDataObject.getSelectedIndex()[2]] = 1;
 
+        // NatTable uses 32-bit int for row/column indices
+        long displayRows = theDataObject.getHeight();
+        long displayCols = theDataObject.getWidth();
+        if (displayRows > Integer.MAX_VALUE) {
+            throw new Exception("Too many rows to display (" + displayRows + ", limit is " +
+                                Integer.MAX_VALUE + "). Please select a smaller subset.");
+        }
+        if (displayCols > Integer.MAX_VALUE) {
+            throw new Exception("Too many columns to display (" + displayCols + ", limit is " +
+                                Integer.MAX_VALUE + "). Please select a smaller subset.");
+        }
+        if (displayRows > Integer.MAX_VALUE / 20) {
+            log.warn("loadData(): row count {} approaches NatTable 32-bit limit; "
+                         + "display may not render correctly. Consider selecting a smaller subset.",
+                     displayRows);
+        }
+        if (displayCols > Integer.MAX_VALUE / 80) {
+            log.warn("loadData(): column count {} approaches NatTable 32-bit limit; "
+                         + "display may not render correctly. Consider selecting a smaller subset.",
+                     displayCols);
+        }
+
         dataValue = null;
         try {
             log.trace("loadData(): call getData()");
diff --git a/object/pom.xml b/object/pom.xml
index 81d66fbb..9dfd434a 100644
--- a/object/pom.xml
+++ b/object/pom.xml
@@ -90,7 +90,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-resources-plugin</artifactId>
-                <version>2.3</version>
+                <version>3.3.1</version>
                 <configuration>
                     <!-- specify UTF-8, ISO-8859-1 or any other file encoding -->
                     <encoding>UTF-8</encoding>
diff --git a/pom.xml b/pom.xml
index 81f52da6..360fd6a5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -105,7 +105,7 @@
     <!-- Instructing the resources plugin to filter certain directories -->
     <resources>
       <resource>
-        <directory>.</directory>
+        <directory>src/main/resources</directory>
         <filtering>true</filtering>
       </resource>
     </resources>
diff --git a/repository/lib/org.eclipse.nebula.widgets.nattable.core.jar b/repository/lib/org.eclipse.nebula.widgets.nattable.core.jar
deleted file mode 100644
index eade4d1c..00000000
Binary files a/repository/lib/org.eclipse.nebula.widgets.nattable.core.jar and /dev/null differ
diff --git a/repository/pom.xml b/repository/pom.xml
index 8de7d0f8..9f4b497f 100644
--- a/repository/pom.xml
+++ b/repository/pom.xml
@@ -111,22 +111,7 @@
                             <generatePom>true</generatePom>
                         </configuration>
                     </execution>
-                    <execution>
-                        <id>eclipse-nebula-widgets-nattable-core</id>
-                        <phase>verify</phase>
-                        <goals>
-                            <goal>install-file</goal>
-                        </goals>
-                        <configuration>
-                            <groupId>org.eclipse.local</groupId>
-                            <artifactId>org.eclipse.nebula.widgets.nattable.core</artifactId>
-                            <version>2.4.0</version>
-                            <packaging>jar</packaging>
-                            <file>
-                                ${basedir}/lib/org.eclipse.nebula.widgets.nattable.core.jar</file>
-                            <generatePom>true</generatePom>
-                        </configuration>
-                    </execution>
+
                     <execution>
                         <id>eclipse-swtbot</id>
                         <phase>verify</phase>