bug fixes in FileEntry and FileBlock