A few small fixes from my Persistent Handles branch

Merge request reports

Loading