Address security issues