Fixes for invalid json

I think the trailing comma is our only problem, but there are possibly others.  We probably can test this on staging.