More old json library fixes