Initial changes for unicode fix. This will need to be expanded on.