Fixed some deprecated import statements.