Additional fixups for 1.8.7 support.