Andrea's fixes