Fix some const char * conversion warnings.
Merge pull request #3555 from unknownbrackets/warnings

Fix some const char * conversion warnings