Add the fixes from the previous three commits to the binary, too. Signed-off-by: Thomas Huth <thuth@redhat.com>