Unicode and csv fixes