Pyfish update after merge