More compile fixes.
Merge pull request #22 from docfaraday/multistream_unit_tests

More compile fixes.