Fixes on import.