json2sql fix-ups

Change-Id: I092d53aa1929b071f80f46b57e9e8936c23e5b52