Additional work on 2.11 migration, plus some hacks for 2.10.3 cross-compilation support