Fix a few build errors from last session
Add BlobStore