Fixed some more errors by patching it with google.gson library.