fix up some import errors caused by move to virtualenv installation