handle some minor issues in backend