diff --git a/.travis.yml b/.travis.yml
index cb99ab5bd0..e9d0d586ea 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,7 +23,7 @@ services:
 before_install:
   - mkdir boost_includes
   - cp -r /usr/include/boost boost_includes/
-  - docker run -dit --name emscripten -v $(pwd):/src trzeci/emscripten:sdk-incoming-64bit bash
+  - docker run -dit --name emscripten -v $(pwd):/src trzeci/emscripten:sdk-tag-1.37.33-64bit bash
 
 install:
   - npm install
diff --git a/packages/perspective-viewer-highcharts/src/js/highcharts.js b/packages/perspective-viewer-highcharts/src/js/highcharts.js
index e28e0d226c..60df34037e 100644
--- a/packages/perspective-viewer-highcharts/src/js/highcharts.js
+++ b/packages/perspective-viewer-highcharts/src/js/highcharts.js
@@ -581,19 +581,21 @@ export function draw(mode) {
 }
 
 function resize(immediate) {
-    if (immediate && this._chart) {
+    if (this._chart && !this._resize_timer) {
         this._chart.reflow();
-    } else {
-        if (this.resize_timer) {
-            clearTimeout(this.resize_timer);
-        }
-        this.resize_timer = setTimeout(() => {
-            if (this._chart && !document.hidden && this.offsetParent && document.contains(this)) {
-                this.resize_timer = undefined;
-                this._chart.reflow();
-            }
-        }, 50);
+    } 
+    if (this._resize_timer) {
+        clearTimeout(this._resize_timer);
+        this._debounce_resize = true;
     }
+    this._resize_timer = setTimeout(() => {
+        if (this._chart && !document.hidden && this.offsetParent && document.contains(this) && this._debounce_resize) {
+            this._chart.reflow();
+        }
+        this._resize_timer = undefined;
+        this._debounce_resize = false;
+    }, 50);
+    
 }
 
 function delete_chart() {
diff --git a/packages/perspective-viewer/src/js/view.js b/packages/perspective-viewer/src/js/view.js
index fe511b0f42..8e4e13c6a2 100644
--- a/packages/perspective-viewer/src/js/view.js
+++ b/packages/perspective-viewer/src/js/view.js
@@ -748,6 +748,14 @@ registerElement(template, {
         }
     },
 
+    'index': {
+        set: function () {
+            if (this._table) {
+                console.error(`Setting 'index' attribute after initialization has no effect`);
+            }
+        }
+    },
+
     'row-pivots': {
         set: function () {
             let pivots = JSON.parse(this.getAttribute('row-pivots'));
diff --git a/packages/perspective-viewer/src/less/row.less b/packages/perspective-viewer/src/less/row.less
index c26d7744e0..243338353d 100644
--- a/packages/perspective-viewer/src/less/row.less
+++ b/packages/perspective-viewer/src/less/row.less
@@ -214,7 +214,7 @@ perspective-row .row_draggable {
 }
 
 perspective-row .row_draggable select {
-    margin-left: 22px;
+    margin: 0px 0px 0px 22px;
     border: none;
 }
 
diff --git a/packages/perspective-viewer/src/less/view.less b/packages/perspective-viewer/src/less/view.less
index 270bebde34..a707479814 100644
--- a/packages/perspective-viewer/src/less/view.less
+++ b/packages/perspective-viewer/src/less/view.less
@@ -225,7 +225,7 @@ perspective-viewer {
     }
     select {
         height: 24px;
-        padding-left: 6px;
+        padding: 0px 0px 0px 6px;
         font-size: 12px;
         -webkit-appearance: none;
         -moz-appearance: none;
diff --git a/packages/perspective/src/cpp/main.cpp b/packages/perspective/src/cpp/main.cpp
index 0950c336d8..211490c624 100644
--- a/packages/perspective/src/cpp/main.cpp
+++ b/packages/perspective/src/cpp/main.cpp
@@ -528,8 +528,8 @@ make_table(
     {
         // If user doesn't specify an column to use as the pkey index, just use
         // row number
-        auto key_col = tbl->add_column("psp_pkey", tindex, false);
-        auto okey_col = tbl->add_column("psp_okey", tindex, false);
+        auto key_col = tbl->add_column("psp_pkey", DTYPE_INT32, true);
+        auto okey_col = tbl->add_column("psp_okey", DTYPE_INT32, true);
 
         for (auto ridx = 0; ridx < tbl->size(); ++ridx)
         {