Last fixes by Alessia.