Some miner fixes and tuning of the import.