Fix packaging and virtualenv handling