Some more psutil fixes