some fixes for service