More fixes for json output