Resolving some security issues