fix Xcode 6 warnings, errors