Fix of some small problems