Fix warnings for OS X

A couple of them snuck into the code recently.