Minor updates for launchapd support