PSU bugfixes

Merged Darryl Green requested to merge github/fork/CJKay/master into master

Created by: CJKay

This PR fixes a couple of bugs identified in the recent asynchronous PSU support.

Merge request reports