Some etherpad fixes and preparations