Few more debugs/tests in storage.