Just a few fixes

cf. commits