Fixup masking in the fwv exporter