Fixed library problems