Fix #63 stream fixes