Added some fixed for pip setup.