Fixing library indexing