Correct metadata retrieval & set offsets
More improvements around remainder fetching (debug & mask generation)