Fix up the blob store handler, needs more testing