Minor stuff on streamline