Fix breakage from upstream databind change.
More fixes for upstream