remove some warning related to implicit conversion of const char * to char *
remove implicit conversion of void* to char*
Merge upstream changes