Fixes for pandas 0.15