Fixed Andrea's libraries