Fix OS X for 21.2