Make changes needed to appease GWT.