Fixing library problems