2 whitespace-only fixes + VideoStream frame listener bug fix