Small fixes suggested by gouessej.