Further fixes to analysis data output