Unicode and plural corrections.