various config fixes

Signed-off-by: Julien Desfossez <jdesfossez@efficios.com>