Fix merge fallout

Fix issues introduced in the latest merge.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>