Fix security problems
Fix security issue