Fix issues with JSON and XML output