Fixed library issues