Fixed some more build errors
Fixed build errors related to json and duplicate symbols