Fix sample XML equivalents