Stock stream definition bug fixes