Fix some new warnings to make XCode 6 happy