Correct security issues