more fixes to constant string pointer depracation