Fixes various typos introduced in a9017af2bb648930e27bab52de12f9983411778c.
Fixes odd encoding problem with wait_for_service.