Updated for 1.5.2 code to cope with Mac OS X launchd server