Two miscellaneous Streamy fixes.