Fix packaging and json