Fix bug where puppet doesn't control service. Fix cyclical dependency.