Even more json fixes. Going to fix my compiler after these