Actually update the fixed up compile failures.

Signed-Off-By: David Howells <dhowells@redhat.com>
4 files changed