Continue fixing 5.2 Travild build.