const correctness fixes resulting from Const class change of 'char *' to
'const char *'