Fixes for OS X warnings.