Minor parallel flow cleanup