More fixes
Come back here streams.go