Improve swing ext, fix json ext