fixing more residual unicode issues