Fix issues with XCode 5