more check_for_stream fixes