fixes after backend updates from Bruce