Adjustments to remove compiler warnings on Mac OS X.