Fixing auto imports