even more fixes to constant string pointer depractation