Small update to XML & JSON code.