more fixes

Signed-off-by: Kenneth Lorthioir <ibelimb@gmail.com>