Final fixes of previous bugs in refback