fix minor bugs with some ... unsupported yet listed streams