Fix unicode handling in save