Make needed changes to the build to facilitate having 2.11 cross-compilation.
Fix test deprecation warnings