Fixing imports in NAMESPACE