Fixed some references to the imports