Fixing a few things to help get better json data.