Fixes during code review - json commas