Improve AbstractService detection. Small fixes.