A bit of fixes and improvements in the streaming plugin