Libraries fix