[DEV] Fixes for imports in relative scheme