More compatibility fixes.

2 jobs for master in 20 minutes and 17 seconds (queued for 2 seconds)