ZEN-8314: Fixing a set of security vulnerabilities