Fix typos, fix type of service_id