Minor fixes for latest pandas on OS X

With an updated system, this works right from the clone now without changes.