Fixes for complex imports (e.g. oryol)