Correctly handle non stream types