Fix regressions introduced in 3a0bca3

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>