Merge "vom/fuzz: some minor changes to the vom fuzzer"