[backend] couple of fixes