Update underscore annotations and try fix charset.