Further Live 9.13 compatibility changes.