Minor fixes etc to json responses