Resolve potential security issues