agent: OS X identifiers fixed