More safe string functions changes