Some minor bug-fixes to the JSON marshallers.