Fixed json serialiser to use real types rather than strings for all