Fix block numbering issue and allow client to shutdown after read