More work on pip setup.