Corrects a couple of issues with our JSON handler.