Fixes to compile under XCode 5.1.