Fix secure issues