Fixes to support new pyfish library