Improved performance for some stream dependent methods