Some stream fixes