Fixups, based on new samples in XOP Toolkit v6