Fixes for service.py and util