diff --git a/holoviews/core/__init__.py b/holoviews/core/__init__.py
index ef8a571c51..4dc6c090bb 100644
--- a/holoviews/core/__init__.py
+++ b/holoviews/core/__init__.py
@@ -27,7 +27,7 @@
 
 try:
     import pandas as pd
-    Dimension.type_formatters[pd.tslib.Timestamp] = "%Y-%m-%d %H:%M:%S"
+    Dimension.type_formatters[pd.Timestamp] = "%Y-%m-%d %H:%M:%S"
 except:
     pass
 
diff --git a/holoviews/core/data/pandas.py b/holoviews/core/data/pandas.py
index 85c55102ae..ecf082b494 100644
--- a/holoviews/core/data/pandas.py
+++ b/holoviews/core/data/pandas.py
@@ -188,7 +188,7 @@ def select(cls, columns, selection_mask=None, **selection):
         if selection_mask is None:
             selection_mask = cls.select_mask(columns, selection)
         indexed = cls.indexed(columns, selection)
-        df = df.ix[selection_mask]
+        df = df.iloc[selection_mask]
         if indexed and len(df) == 1 and len(columns.vdims) == 1:
             return df[columns.vdims[0].name].iloc[0]
         return df
diff --git a/holoviews/core/util.py b/holoviews/core/util.py
index 9e4d53cc7c..f68aba71ff 100644
--- a/holoviews/core/util.py
+++ b/holoviews/core/util.py
@@ -24,7 +24,7 @@
 
 try:
     import pandas as pd # noqa (optional import)
-    datetime_types = datetime_types + (pd.tslib.Timestamp,)
+    datetime_types = datetime_types + (pd.Timestamp,)
 except ImportError:
     pd = None