Service definition fixes