Performance fixes. Attempted to fix gson related crash in prod.
v18