Fixes to address 'deprecated conversion from string constant to char*' warnings with GCC