fix build issues
made json-compliant