New psutil fixes

Fixes for new psutil.