Fix imports for release builds