Switched to using MemoryBlockStream in a few more places