Hivex: Backport updates from Hilko Bengen