Fixes CVE-2020-8619 and few more issues
Signed-off-by: Tomas Hozza <thozza@redhat.com>
Signed-off-by: Adam Tkac <atkac@redhat.com>