A few fixes now that we control the version of psutil used