hds-v5: More fixes for mmap