Import fix and symlink fixes