Fix upload and json parser