A couple of minor updates related to service references

Please pull..