More fixes for Etherpad