fixes after virtualenv reorganization