A few small fixes from Bastien.