some more small fixes for old backend