another round of fixes for stream player