Re-commit to solve various last minute issues for charsets, etc.