Fixes for a few json parsing errors