Refactoring: platform selection at instance creation and service adding uses the same code.
Minor fix