Tidy up some loose ends in HA Agent