Merge a few more upstream fixes
Fix clang warnings
Try to resolve missing ipx symbol errors.