Fixes import locations