RHBZ-989265: Fix problems found in review request