EXPERIMENTAL: security fixes