Fixed some references to the bad imports