Add import statement and fix broken one