Make a few things non agora specific