Fix handling files with unicode names or contents

Fix handling files with unicode names or contents #487