Fixes to improve handling of HA components