Subject: Misc EEH fixes

From: Oliver O'Halloran <[email-masked]>
Date: Mon, 15 Jul 2019 18:56:07 +1000

Fixes of no particular importance. I just wanted to cut down the pile of
patches I've got hanging around.