Block storage fixes