Practical fixes to the service get calls