fixed imports for command-line execution