Public etherpad fixes