Fix up code to extract API Mac.