A couple of minor fixes and possibility to disable storage retrieval requests in the Demo driver.