Improve some streams