Fix secure string issues