Fix SECURITY ISSUES