Prepare switch to mozilla88

Edited by Georg Koppen