Minor fixes and security issues.