Fixing up my imports