Fixes for use with Papilio DUO testplan