Fix sources and json export