Two misc fixes.
Merge pull request #47 from alxhub/two-misc-streamy-fixes

Two miscellaneous Streamy fixes.