Fix a potential NPE in JsonMappackMetadata
Update TODO