Fixes import statements