More fixing

Signed-off-by: Jerome Gingras <jerome.gingras@gmail.com>