Fix a couple issues with new GString converter.