Fixes to data table and JSON serializer in preparation for full offline access commit.