Fix typo in hostnames
Merge pull request #911 from andrerod/dev

Multiple fixes