More fixes for conda.