More OSX compatibility code.
Fix new warnings with Gcc 4.8.