Some security-related fixes