XML and other export fixes