More fixes, still not operational import.