Also fixes three additional issues found since v4.6.3 rebase. Signed-off-by: Alexander Scheel <ascheel@redhat.com>