Fix errors from latest OS/X compiler