Minor tweaks to fix undefined string warnings