Fixing library imports