Fix for issues preventing cluster bootstrap

Small fixes found when adding support for drac cluster.

They are related to changes that happened after the last new cluster addition, so it's normal to catch them now while adding a new cluster.