fixes for service repo impl