JSON fixes. LAST COMMIT

This is the LAST COMMIT for this fork. Please do not expect any more
updates for the fork.