Changes for OS X 10.9 and Server 3