Fixed global import directories and variables