From Stéphane Bryant: fixes in reload fragmentation handling