Fixed library conflicts