Fixed more security issues