Fix scope for imports