Fix some bugs due to the new entry chunks representation.