[service] - fixes for service