Patch 3

Security & charset fixes