HomeClusterLabs Projects

Merge pull request #3337 from kgaillot/fixes

Description

Merge pull request #3337 from kgaillot/fixes

Miscellaneous small fixes