Minor improvements in import.