(de)serialization fix
Small improvement
Unicode path fix