dependency fix and fixing BlobBuilder lookup to include unprefixed one

For more info see link in commit message.