Solved security issues