more compatibility work

2 jobs for master in 9 minutes and 57 seconds (queued for 3 seconds)